Tidy xend-config.sxp, removing entries that haven't been used since the

hotplugging stuff was introduced (block-*, console-port-base, console-address)
and introducing entries for options that have been present for ages
(xend-{http,unix,relocation}-server, xend-unix-path, xend-relocation-address,
enable-dump).  Remove vif-antispoof, as Vifctl no longer passes this option
down.

Made the xend-relocation-server default to no, as this is a potential security
hole and so must be turned on explicitly.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/examples/xend-config.sxp b/tools/examples/xend-config.sxp
index 881eaacfbc03e09c1720104a1b64800208e52994..ba433cd7450bae7bdcaa5e9d3ea1bf582bea9306 100644 (file)
--- a/tools/examples/xend-config.sxp
+++ b/tools/examples/xend-config.sxp
@@ -1,27 +1,52 @@
+# -*- sh -*-
+
+#
 # Xend configuration file.
+#
 
-# Port xend should use for the HTTP interface.
-(xend-port         8000)
+# This example configuration is appropriate for an installation that trusts
+# only localhost connections, and is otherwise fully functional, with a
+# bridged network configuration.
 
-# Port xend should use for the event interface.
-(xend-event-port   8001)
+# Commented out entries show the default for that entry, unless otherwise
+# specified.
 
-# Address xend should listen on for HTTP connections.
-# Specifying 'localhost' prevents remote connections.
-# Specifying the empty string '' allows all connections.
-(xend-address      'localhost')
+#(logfile /var/log/xend.log)
+#(loglevel DEBUG)
+
+#(xend-http-server no)
+(xend-http-server yes)
+#(xend-unix-server yes)
+#(xend-relocation-server no)
+(xend-relocation-server yes)
+
+#(xend-unix-path /var/lib/xend/xend-socket)
+
+# Port xend should use for the HTTP interface, if xend-http-server is set.
+#(xend-port            8000)
+
+# Port xend should use for the event interface.  This interface is deprecated.
+#(xend-event-port      8001)
 
-# The port xend should start from when allocating a port
-# for a domain console.
-(console-port-base 9600)
+# Port xend should use for the relocation interface, if xend-relocation-server
+# is set.
+#(xend-relocation-port 8002)
 
-# Address xend should listen on for console connections.
+# Address xend should listen on for HTTP connections, if xend-http-server is
+# set.
 # Specifying 'localhost' prevents remote connections.
-# Specifying the empty string '' allows all connections.
-(console-address   'localhost')
+# Specifying the empty string '' (the default) allows all connections.
+#(xend-address '')
+(xend-address localhost)
+
+# Address xend should listen on for relocation-socket connections, if
+# xend-relocation-server is set.
+# Meaning and default as for xend-address above.
+#(xend-relocation-address '')
+(xend-relocation-address localhost)
 
 # The limit (in kilobytes) on the size of the console buffer
-(console-limit 1024)
+#(console-limit 1024)
 
 ## Use the following if VIF traffic is routed.
 # The script used to start/stop networking for xend.
@@ -37,16 +62,6 @@
 # The default script used to control virtual interfaces.
 (vif-script        vif-bridge)
 
-# Whether iptables should be set up to prevent IP spoofing for
-# virtual interfaces. Specify 'yes' or 'no'.
-(vif-antispoof     no)
-
-# Setup script for file-backed block devices
-(block-file block-file)
-
-# Setup script for enbd-backed block devices
-(block-enbd block-enbd)
-
 # Dom0 will balloon out when needed to free memory for domU.
 # dom0-min-mem is the lowest memory level (in MB) dom0 will get down to.
 # If dom0-min-mem=0, dom0 will never balloon out.
@@ -55,3 +70,6 @@
 # In SMP system, dom0 will use dom0-cpus # of CPUS
 # If dom0-cpus = 0, dom0 will take all cpus available
 (dom0-cpus 0)
+
+# Whether to enable core-dumps when domains crash.
+#(enable-dump no)

diff --git a/tools/python/xen/xend/XendRoot.py b/tools/python/xen/xend/XendRoot.py
index b504c82e0f9c84a893f6d17729d183080e879c18..b51046a87b60a3f7893f22d563effd3d524db21e 100644 (file)
--- a/tools/python/xen/xend/XendRoot.py
+++ b/tools/python/xen/xend/XendRoot.py
@@ -64,7 +64,7 @@ class XendRoot:
     xend_address_default      = ''
 
     """Default for the flag indicating whether xend should run a relocation server."""
-    xend_relocation_server_default = 'yes'
+    xend_relocation_server_default = 'no'
 
     """Default interface address the xend relocation server listens at. """
     xend_relocation_address_default = ''